demos: remove testpixbuf-drawable

It only tested GdkRGB, and we're about to kill that.

diff --git a/demos/Makefile.am b/demos/Makefile.am
index 75fcbe5d7936de37e2eefc9a8404280d83a38235..87aefa4aca1188f45a8a18adf4d43784d678a9fb 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -22,7 +22,6 @@ LDADDS =                                                              \
        $(MATH_LIB)
 
 noinst_PROGRAMS =              \
-       testpixbuf-drawable     \
        testanimation           \
        testpixbuf-color        \
        testpixbuf-save         \
@@ -41,7 +40,6 @@ test-inline-pixbufs.h: apple-red.png gnome-foot.png
        || (rm -f test-inline-pixbufs.h && false)
 
 testpixbuf_DEPENDENCIES = $(DEPS)
-testpixbuf_drawable_DEPENDENCIES = $(DEPS)
 testpixbuf_save_DEPENDENCIES = $(DEPS)
 testpixbuf_color_DEPENDENCIES = $(DEPS)
 testpixbuf_scale_DEPENDENCIES = $(DEPS)
@@ -49,7 +47,6 @@ testanimation_DEPENDENCIES = $(DEPS)
 pixbuf_demo_DEPENDENCIES = $(DEPS)
 
 testpixbuf_LDADD = $(LDADDS)
-testpixbuf_drawable_LDADD = $(LDADDS)
 testpixbuf_save_LDADD = $(LDADDS)
 testpixbuf_color_LDADD = $(LDADDS)
 testpixbuf_scale_LDADD = $(LDADDS)
@@ -57,7 +54,6 @@ testanimation_LDADD = $(LDADDS)
 pixbuf_demo_LDADD = $(LDADDS)
 
 testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
-testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
 testpixbuf_save_SOURCES = testpixbuf-save.c
 testpixbuf_color_SOURCES = testpixbuf-color.c
 testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c

diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c
deleted file mode 100644 (file)
index ad4e4a0..0000000
--- a/demos/testpixbuf-drawable.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "config.h"
-#include <gtk/gtk.h>
-
-int
-close_app (GtkWidget *widget, gpointer data)
-{
-   gtk_main_quit ();
-   return TRUE;
-}
-
-int
-expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
-{
-   GdkPixbuf *pixbuf;
-         
-   pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
-   if (gdk_pixbuf_get_has_alpha (pixbuf))
-   {
-      gdk_draw_rgb_32_image (drawing_area->window,
-                            drawing_area->style->black_gc,
-                            evt->area.x, evt->area.y,
-                            evt->area.width,
-                            evt->area.height,
-                            GDK_RGB_DITHER_MAX,
-                            gdk_pixbuf_get_pixels (pixbuf) +
-                            (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-                            (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-                            gdk_pixbuf_get_rowstride (pixbuf));
-   }
-   else
-   {
-      gdk_draw_rgb_image (drawing_area->window, 
-                         drawing_area->style->black_gc, 
-                         evt->area.x, evt->area.y,
-                         evt->area.width,
-                         evt->area.height,  
-                         GDK_RGB_DITHER_NORMAL,
-                         gdk_pixbuf_get_pixels (pixbuf) +
-                         (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-                         (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-                         gdk_pixbuf_get_rowstride (pixbuf));
-   }
-   return FALSE;
-}
-
-int
-configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
-{
-   GdkPixbuf *pixbuf;
-                           
-   pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
-    
-   g_print ("X:%d Y:%d\n", evt->width, evt->height);
-   if (evt->width != gdk_pixbuf_get_width (pixbuf) || evt->height != gdk_pixbuf_get_height (pixbuf))
-   {
-      GdkWindow *root;
-      GdkPixbuf *new_pixbuf;
-
-      root = gdk_get_default_root_window ();
-      new_pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-                                                0, 0, 0, 0, evt->width, evt->height);
-      g_object_set_data (G_OBJECT (drawing_area), "pixbuf", new_pixbuf);
-      g_object_unref (pixbuf);
-   }
-
-   return FALSE;
-}
-
-extern void pixbuf_init (void);
-
-int
-main (int argc, char **argv)
-{   
-   GdkWindow     *root;
-   GtkWidget     *window;
-   GtkWidget     *vbox;
-   GtkWidget     *drawing_area;
-   GdkPixbuf     *pixbuf;    
-   
-   pixbuf_init ();
-
-   gtk_init (&argc, &argv);   
-   gdk_rgb_set_verbose (TRUE);
-
-   gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
-   root = gdk_get_default_root_window ();
-   pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-                                         0, 0, 0, 0, 150, 160);
-   
-   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-   g_signal_connect (window, "delete_event",
-                    G_CALLBACK (close_app), NULL);
-   g_signal_connect (window, "destroy",   
-                    G_CALLBACK (close_app), NULL);
-   
-   vbox = gtk_vbox_new (FALSE, 0);
-   gtk_container_add (GTK_CONTAINER (window), vbox);  
-   
-   drawing_area = gtk_drawing_area_new ();
-   gtk_widget_set_size_request (GTK_WIDGET (drawing_area),
-                                gdk_pixbuf_get_width (pixbuf),
-                                gdk_pixbuf_get_height (pixbuf));
-   g_signal_connect (drawing_area, "expose_event",
-                    G_CALLBACK (expose_cb), NULL);
-
-   g_signal_connect (drawing_area, "configure_event",
-                    G_CALLBACK (configure_cb), NULL);
-   g_object_set_data (G_OBJECT (drawing_area), "pixbuf", pixbuf);
-   gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE, 0);
-   
-   gtk_widget_show_all (window);
-   gtk_main ();
-   return 0;
-}